edit user account layout

James Peret 10 years ago
parent
commit
7993795e1e
4 changed files with 91 additions and 61 deletions
  1. 89 60
      app/views/devise/registrations/edit.html.erb
  2. 1 0
      config/locales/en.yml
  3. 1 1
      config/locales/pt-BR.yml
  4. BIN
      dump.rdb

+ 89 - 60
app/views/devise/registrations/edit.html.erb

@@ -1,71 +1,100 @@
1 1
 <% title (t 'registration.edit_profile') + ' - ' + @config.website_name %>
2 2
 
3
-<%= content_tag(:div, class: 'container top-container') do %>
3
+
4
+
5
+
6
+
7
+<%= content_tag(:div, class: 'container top-container last-container') do %>
4 8
 	<%= content_tag(:div, class: 'row') do %>
5 9
 		<%= content_tag(:div, class: 'span12') do %>
6
-			<%= render :partial => 'layouts/flash' %>
7
-			
8 10
 			<% # Page Content %>
11
+			<%= render :partial => 'layouts/flash' %>
12
+			<%= content_tag(:div, class: 'page-header') do %>
13
+				<%= content_tag(:h1) do %>
14
+					<%= t 'registration.edit_profile' %>
15
+				<% end %>
16
+			<% end %>
17
+		<% end %>
18
+	<% end %>
19
+	
20
+		
21
+	<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>  
9 22
 
10
-			<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>  
11
-				<div class="span6 offset3 media thumbnail" style="padding: 0px">
12
-					<div class="login-panel panel panel-default" style="padding: 10px;">
13
-					     <div class="panel-heading">
14
-					         <h3 class="panel-title"><%= t 'registration.edit_profile'%></h3>
15
-					     </div>
16
-					     <div class="panel-body">
17
-							  <%= f.alert_message "Please fix the errors below."%>
18
-							  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
19
-							  	<p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
20
-							  <% end %>
21
-							  <div class="form-inputs">
22
-				    
23
-				    			   <div class="fileupload fileupload-new pull-right" data-provides="fileupload" style="margin-top: 5px;">
24
-				    					<div class="fileupload-preview thumbnail" data-trigger="fileinput" style="width: 140px; height: 140px;">
25
-										<%=  image_tag @user.avatar.to_s if @user.avatar? %>
26
-									</div>
27
-									<br>
28
-				    					<span class="btn btn-default btn-file btn-mini" style="width: 135px;">
29
-				    						<span class="fileinput-new"></span>
30
-				    						<span class="fileinput-exists"></span>
31
-				    						<%= f.file_field :avatar, class: 'hidden', label: (t 'blog.select_image') %>
32
-				    					</span>
33
-				    			    </div>
34
-				    
35
-							    <%= f.text_field :first_name, label: (t 'registration.first_name'), required: true, autofocus: true, class: 'span4' %>
36
-							    <%= f.text_field :last_name, label: (t 'registration.last_name'), required: false, class: 'span4' %>
37
-							    <%= f.email_field :email, required: true, class: 'span4' %>
38
-							    </div>
39
-							    <hr>
40
-							    <div class="form-inputs">
41
-						    		    <%= f.form_group :title, class: "pull-left", style: 'margin-left: 0px; width: 30%;' do %>
42
-						    		        <%= f.password_field :password, label: (t 'registration.password'), required: false, class: 'input-block-level' %>
43
-						    		    <% end %>
44
-						    		    <%= f.form_group :slug, class: "pull-left", style: 'margin-left: 27px; width: 30%;' do %>
45
-						    		        <%= f.password_field :password_confirmation, label: (t 'registration.password_confirmation'), required: false, class: 'input-block-level' %>
46
-						    		    <% end %>
47
-						    		    <%= f.form_group :slug, class: "pull-left", style: 'margin-left: 27px; width: 30%;' do %>
48
-						    		        <%= f.password_field :current_password, label: (t 'registration.current_password'), required: false, class: 'input-block-level' %>
49
-						    		    <% end %>
50
-						         </div>
51
-				    
52
-				    
53
-				    
54
-							  </div>
55
-							  <div class="clearfix"></div>
56
-						  </div>
57
-						  <div class="form-actions" style="margin: 0px; margin-top: 15px;">
58
-						    <%= f.submit  (t 'registration.update') %>
59
-						    <%= link_to ('<i class="fa fa-exclamation-triangle"></i> '+(t 'registration.cancel_account')).html_safe, delete_user_account_path, data: { confirm: (t 'registration.cancel_confirmation') }, method: :delete, class: 'btn btn-danger pull-right', id: "delete_account" %>
60
-						  </div>
61
-					     </div>
62
-					 </div>
63
-				</div>
23
+		<% # Edit Agent Account %>
24
+		<%= content_tag(:div, class: 'row') do %>
25
+			<% # Form - User %>
26
+			<%= content_tag(:div, class: 'offset2 span8') do %>
27
+				<%= f.alert_message "Please fix the errors below." %>
28
+					<%= content_tag(:div, class: 'panel panel-default') do %>
29
+				     <div class="panel-body">
30
+						<%= content_tag(:div, class: 'panel-content') do %>
31
+							  <%= content_tag(:div, class: 'panel-text') do %>
32
+								  <%= f.alert_message "Please fix the errors below."%>
33
+								  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
34
+								  	<p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
35
+								  <% end %>
36
+								  <div class="form-inputs">
37
+			    
38
+					    			   <div class="fileupload fileupload-new pull-right centered" data-provides="fileupload" style="margin-top: 5px;">
39
+					    					<div class="fileupload-preview thumbnail" data-trigger="fileinput" style="width: 170px; height: 170px; border-radius: 150px;">
40
+											<%=  image_tag @user.avatar.to_s if @user.avatar? %>
41
+										</div>
42
+										<br>
43
+					    					<span class="btn btn-default btn-file btn-small" style="margin-top: 10px;">
44
+					    						<span class="fileinput-new"></span>
45
+					    						<span class="fileinput-exists"></span>
46
+					    						<%= f.file_field :avatar, class: 'hidden btn', label: (t 'blog.select_image') %>
47
+					    					</span>
48
+					    			    </div>
49
+			    
50
+								    <%= f.text_field :first_name, label: (t 'registration.first_name'), required: true, autofocus: true, class: 'span5' %>
51
+								    <%= f.text_field :last_name, label: (t 'registration.last_name'), required: false, class: 'span5' %>
52
+								    <%= f.email_field :email, required: true, class: 'span5' %>
53
+								    </div>
54
+								    <hr>
55
+								    <div class="form-inputs">
56
+							    		    <%= f.form_group :title, class: "pull-left", style: 'margin-left: 0px; width: 30%;' do %>
57
+							    		        <%= f.password_field :password, label: (t 'registration.password'), required: false, class: 'input-block-level' %>
58
+							    		    <% end %>
59
+							    		    <%= f.form_group :slug, class: "pull-left", style: 'margin-left: 27px; width: 30%;' do %>
60
+							    		        <%= f.password_field :password_confirmation, label: (t 'registration.password_confirmation'), required: false, class: 'input-block-level' %>
61
+							    		    <% end %>
62
+							    		    <%= f.form_group :slug, class: "pull-left", style: 'margin-left: 27px; width: 30%;' do %>
63
+							    		        <%= f.password_field :current_password, label: (t 'registration.current_password'), required: false, class: 'input-block-level' %>
64
+							    		    <% end %>
65
+							         </div>
66
+			    
67
+			    
68
+			    
69
+								  </div>
70
+								  <div class="clearfix"></div>
71
+							<% end %>
72
+						<% end %>
73
+					  </div>
74
+					<% # Form - Submit %>
75
+					<%= content_tag(:div, class: "form-submit-center") do %>
76
+						<%= content_tag(:p) do %>
77
+							<%= f.submit (t 'registration.update'), class: 'btn btn-large btn-success spacer-left-small' %>
78
+						<% end %>
79
+					<% end %>
80
+				<% end %>
81
+			<% end %>
82
+			<% # Sidebar - Mission Agent Details %>
83
+			<% content_tag(:div, class: 'span4 sidebar') do %>
84
+			     <%= content_tag(:div, class: 'panel panel-default sidebar-carret') do %>
85
+			     	<%= content_tag(:div, class: 'panel-body white-bg') do %>
86
+				   		<%= content_tag(:div, class: "panel-content") do %>
87
+				   			<%= content_tag(:div, class: "panel-text") do %>
88
+								<%= content_tag(:h3, (t 'mission_editor.agents.agent_details_help_title')) %>
89
+								<%= content_tag(:div, (t 'mission_editor.agents.agent_details_help').html_safe, class: 'small-text') %>
90
+							<% end %>
91
+						<% end %>
92
+					<% end %>
93
+				<% end %>
64 94
 			<% end %>
95
+		<% end %>
65 96
 
66 97
 
67
-			
68
-			<% # End of Page Content %>
69
-		<% end %>
70 98
 	<% end %>
99
+
71 100
 <% end %>

+ 1 - 0
config/locales/en.yml

@@ -310,6 +310,7 @@ en:
310 310
     edit_password: Edit password
311 311
     email: Email
312 312
     not_open_for_signup: '%{name} is not open for signup right now.' 
313
+    edit_profile: Edit user profile
313 314
   subscription:
314 315
     subscribers: Subscribers
315 316
     header: Subscribe to our newsletter

+ 1 - 1
config/locales/pt-BR.yml

@@ -306,7 +306,7 @@ pt-BR:
306 306
     new_password: Nova Senha
307 307
     confirm_your_new_password: Confirmar Nova Senha
308 308
     change_password: Salvar Senha
309
-    edit_profile: Editar Informações de Registro
309
+    edit_profile: Editar registro
310 310
     current_password: Senha Atual
311 311
     update: Atualizar
312 312
     cancel_account: Cancelar Conta

BIN
dump.rdb